merge trunk
authorK. Handa <handa@gnu.org>
Sun, 23 Jun 2013 07:45:33 +0000 (16:45 +0900)
committerK. Handa <handa@gnu.org>
Sun, 23 Jun 2013 07:45:33 +0000 (16:45 +0900)
commit74f7cb28edfd71e7f19a82431eaad89222c16412
tree57e2c264e8e964ca746a3e7363fcb0a79f37c1f8
parentdd03860a2d598cb0b77d7f3d889524e24641667e
parent50c9e8344088c44e493cc299859b1363639cba34
merge trunk